//
//  OtherViewController.m
//  WKWebviewDemo
//
//  Created by 许金金 on 17/3/5.
//  Copyright © 2017年 许金金. All rights reserved.
//

#import "OtherViewController.h"

@interface OtherViewController ()

@end

@implementation OtherViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view.;
    
    self.view.backgroundColor=[UIColor cyanColor];
    NSLog(@"添加了新的分支，用来完成任务1");
    
    UILabel *lab=[[UILabel alloc] initWithFrame:CGRectMake(75, 200, 200, 100)];
    lab.backgroundColor=[UIColor redColor];
    lab.text=@"task1,从dev开的分支，但是现在dev分支被删除了，能把dev合并到其它分支吗？";
    lab.numberOfLines=0;
    [self.view addSubview:lab];
    
    
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

/*
#pragma mark - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
    // Get the new view controller using [segue destinationViewController].
    // Pass the selected object to the new view controller.
}
*/

@end
